Revert d6b5aaa..3b90e04

This rolls back to commit d6b5aaa7ec95cff0df2a9c14a7df1482fd1829c3.