Revert 72a7689..6e2b50a

This rolls back to commit 72a7689ffc7d6f34d37324c9716a12b45556dcb3.