Revert 5534222..3567ec8

This rolls back to commit 55342227e7dfbacb8cc1308533b90d47eb800ae9.