Reverting unnecessary action_base layout changes