Revert 83cd5f4..80144a8

This rolls back to commit 83cd5f45ce81a93bc56275f5da9a95c3ae8153a3.