Any reason why this was taken out? I'd love to merge your pull request but taking this layout code out now conflicts.