Revert 2b6a21c..66e0c45

This rolls back to commit 2b6a21c387bd6f540aa9bdbb60547c44b77ffec4.