Revert 7c9e169..74789b9

This rolls back to commit 7c9e169855e6396fb5adf5ced4adfede1b737b64.