Revert 2ca9a61..9930342

This rolls back to commit 2ca9a615d2dc5075ec66a551d389f724aac52bd0.