Revert 0c48acc..123d47a

This rolls back to commit 0c48accbd0ee9fab3b1d3b1e6dd4fe9dc58ee86f.