Revert 77cde43..f153115

This rolls back to commit 77cde43d1da33ff49b0c084c4c27b66827c5af56.