Revert "Fixes #1009 (double space hell)"

This reverts commit 5fe57aa036a3507997f467740bfb443327d3805c.
Hopefully Fixes #832, Closes #1009 (double spaces)