Revert f7f5a55..c4a8bd9

This rolls back to commit f7f5a55420b126c0b83a88a6d8a76776ace9669b.