Revert fc77358..5da08b5

This rolls back to commit fc77358eab48184b3408db95a44369f0b85cc752.