Revert 977e2e4..bb2665c

This rolls back to commit 977e2e46feed9eb7f96143fe7c71c254024a0a50.