Revert 60d14a7..17e2db7

This rolls back to commit 60d14a73ea20c25a33755ee7042d0c387b05ce49.