Revert 64c98ab..6a13465

This rolls back to commit 64c98ab871727a057a650f6edead7421664db7ad.