Revert 12529ea..bb733b7

This rolls back to commit 12529eaf54cacefd381cb983469cce22aba6446e.