Revert a4f7886..6276508

This rolls back to commit a4f7886c4342a1a84399398ed5927a3b670bcf18.