Revert fbebfc1..06d3eb2

This rolls back to commit fbebfc1c42986c325242719a472d62eaa47cdf69.