Revert fb29901..1b2ed9c

This rolls back to commit fb299016e56f22db7baf47a9c9da21659c21a156.