Revert 5163a24..fab7faa

This rolls back to commit 5163a2420a4d427a8d6e0a36b629f98d9013d425.