Revert c920b60..16cd3ae

This rolls back to commit c920b60fca8e2b910ab786ef3bfaa18c13436a7e.