Revert 1731c04..6a9eeb5

This rolls back to commit 1731c04a39062731b3c489848df1d85a9cc351bd.