Revert 0dcd322..b1f1a58

This rolls back to commit 0dcd322606dab5afb19a255cd74dc4379d2ed3c4.