Revert 3a57cbd..83365cc

This rolls back to commit 3a57cbdacbc9f6c54c17767a8b9e15fc88beb42b.