Issue #1184006: Replaced the debugging blocks with simple markup elements. Same functionality, but less problems.