Revert 24f22ca..bfb0ca6

This rolls back to commit 24f22ca775d484e4db185727ff83e658f9a382a9.