Revert changes from comments logic in layout