Revert fc4da65..a531da9

This rolls back to commit fc4da650666455fe13089a618fa3420c2b1b01b9.