Revert 412eff5..d44dca3

This rolls back to commit 412eff5a9afb993e717d25f4d4faa560cf165636.