Revert 0ae1315..d257f51

This rolls back to commit 0ae13159c4861d4b04a70b14c51183d836737d5d.