Revert f11c198..4501f7c

This rolls back to commit f11c198f2e6fca18f7485c8277ae3b0f6a37977d.