Revert 76cf482..c607a88

This rolls back to commit 76cf4828a0a8a779033d7f3a1a211dd6537599b3.