Revert 8392b1a..5cb3d7b

This rolls back to commit 8392b1a9e4fd1b52171577c2db28ce40cd1c348c.