Revert ad5c34d..b3a16d7

This rolls back to commit ad5c34d87886ce25c84897d565e82d0936543e0f.