Revert 6a994fd..65436b4

This rolls back to commit 6a994fd1ec13617c49cd1fa24f3ee28f6f0af379.