Revert 9cd0d60..c7177f8

This rolls back to commit 9cd0d60f2034fbfb8c1f5c1aca550abc942763fe.