Revert 17bc2a7..4676a3a

This rolls back to commit 17bc2a7e67761b685eb7f36d2b9b76cb2ec9389b.