Revert 6f8f696..81d03e7

This rolls back to commit 6f8f6964abc46ae55f40ba2a22404044aabc8db4.