Revert 1a3700d..86502a9

This rolls back to commit 1a3700df4d3aec54ac2b7aa83a0aadfbba87c4e0.