Revert 42131a4..4de8319

This rolls back to commit 42131a427dc29fd12588a79bbd9d78f1b1f2fadb.