Revert 85c696c..e4668cf

This rolls back to commit 85c696c5ecdb2135af6465f9d10dc26357a0c884.