Revert bdc11d5..4a452ac

This rolls back to commit bdc11d5aec9d3ce275fe001328ddebd8a038736b.
rb