Revert f01d807..af39ed2

This rolls back to commit f01d8075f9a35c5e5fd3f340d6887addbd3b8cc6.