Revert a0cb79d..84b5179

This rolls back to commit a0cb79d51656373043d1f8b21d0ff87c4fdb779e.