Revert 1ba965a..aa9b85c

This rolls back to commit 1ba965aa4e5b78b3129a193d6fe82f5a4c665b15.