Revert 9d8d956..6cc5c5b

This rolls back to commit 9d8d956e7eeed2b2a599bc19997edd82f8e86e42.