Revert 2132396..59b360a

This rolls back to commit 21323966c707d83ce1f7a201b25cc3b75b9813a8.