Revert 039c5d5..7d9ec77

This rolls back to commit 039c5d5e12654bb1de9c67281dabad5a2f60a823.