Revert 8727115..02ee7b8

This rolls back to commit 87271158db372b5eb04c5bb13d01203440ab674e.