Revert 49f9daa..dd066c3

This rolls back to commit 49f9daa3d2bb089339110951fe8222df0420232c.