Revert d1504cc..fdaaad9

This rolls back to commit d1504cc5571a0a4b39faaaebcfd3cef195def9a6.