Revert 8d3c0ee..bdb9698

This rolls back to commit 8d3c0ee1218985413743dac4f2e0582dfd30ebcf.