Revert 08587ba..9b06ad5

This rolls back to commit 08587ba3f6b10d892d480877b0d6ab2378c1ad3c.