Revert c47b53e..fde7d3d

This rolls back to commit c47b53e793a636629cd634b43759bb11a0e69f54.