Revert 440a910..7511838

This rolls back to commit 440a91021b5add86036cf248c1873df15242f7d5.