Revert 7783c9a..1dae15d

This rolls back to commit 7783c9a59001a42b3ac4f9f190a56e524c5c8316.