Revert c1d80d4..3a1a106

This rolls back to commit c1d80d40ee480a66198faf402e56c1002087fa79.
erooor