Revert a4d53f5..8bc4851

This rolls back to commit a4d53f5c99f9740a1276254c97869b2548752986.
Testing