Revert ca5a248..1c16a8f

This rolls back to commit ca5a248f18d08bb5279e04b119f926edb2b7a832.