Revert 427cea6..90037bf

This rolls back to commit 427cea6ce203e4d80b4b59fd12b69ba68bf9071d.