Revert 3c55fdc..9f44fd3

This rolls back to commit 3c55fdcb62a8149259780d33bba5b349143fb5d6.