Revert 9bb6788..dc53317

This rolls back to commit 9bb6788c8abd24e93b8796098cff07cedbb11723.