Revert a8b4ae1..78f4803

This rolls back to commit a8b4ae157cf90ac2419317e023c4b16165aa995c.