Revert 51979c0..531ed11

This rolls back to commit 51979c0896f17e42e59dd4e7039beffa850e79cf.