Revert 86f3f9d..356e175

This rolls back to commit 86f3f9dd6de6db526729a798b274b828760acc38.