Revert 2f97b80..ec3c5eb

This rolls back to commit 2f97b808eaf3a58a61f2a1779c50952ee15ed876.