Revert "Merge pull request #470 from simonowendesign/master"

This reverts commit 49e0b1f68247ab65590ddfc65d4f962b874650c7, reversing
changes made to 80d325842fb54f84926aec9b8a7dba6116a2953a.