Revert 76864eb..20a774e

This rolls back to commit 76864eb9dfa9522feeb422e988809eb6581e7d55.