Revert "Fix layout delete issue, fix layout adding to top of the area."

Some inline edit mode functions do not clean up after themselves
properly by firing the `EditModeExitInline` event. Commit aa15316 did
not anticipate this, and so allowed the bugs in these inline edit
functions to rear their ugly heads. For the sake of stability and a timely
release, reverting it hides these issues and brings back #1184 as it is 
much less severe than the aforementioned bugs.

This also reverts commit 3c3860a0a72c9c02d9d0cc0efd879016e8b9d2eb.