Revert d4538fc..453de73

This rolls back to commit d4538fc5c362807cc615814c25f986a9243744fb.