Rollback implementation of changing layout on the fly, because corner cases were found.