Revert 64fb6e7..f5a0968

This rolls back to commit 64fb6e739e2574ce6efbed2dcb25c7486efba729.