Revert a0f08fb..6e9a1bd

This rolls back to commit a0f08fb484961abf98639ce4cc7e0ed54abbfbbc.