Revert 3df2b78..d5c1153

This rolls back to commit 3df2b78bc89c175835a3bbc13898b86506ccf72c.