Revert 606fae2..11f5722

This rolls back to commit 606fae26d14e8e09715dc3791a901bf2c65224f7.