Revert df474ac..c84816c

This rolls back to commit df474ac945898d08372236b33d42d6d32a229da7.