Revert af14ea0..a883cbd

This rolls back to commit af14ea0a000a619ccc47a779f31863c060467f95.