Revert 56644ca..7c96f7d

This rolls back to commit 56644caea7986f9518267b039bcd63b1762a4307.