Revert 23bcd44..3737e93

This rolls back to commit 23bcd4450d7676f1430edfdfa9ce0cef3ec6fe7d.
Test