Revert f07d743..fdc485e

This rolls back to commit f07d7437a7fb91f8bd999f1cbc8a0bc9d1ae438d.