Revert 35690bb..0ffb615

This rolls back to commit 35690bb3bee620928e3478ed4aec2e0826533f65.