Revert 34f0e4b..eac2a15

This rolls back to commit 34f0e4b1d06d1eee93ed2561949c515cae3a99ad.
Optimized layout for paper