Revert "All that space seems wasted..."

This reverts commit d814865bb37cfec079bc4f19baae0cef2e029ba5.