Revert f5f22ec..e3dc0c4

This rolls back to commit f5f22ec756f73f4710cf9887c0d8fa93725ec785.