Revert 6a35634..a1eb62e

This rolls back to commit 6a35634211f8fbad4b1a2c5c8d5e68f3e789e31a.