Revert 203e31a..4f86703

This rolls back to commit 203e31ab15a974e29ab78fec0f85ee29843658ae.