Revert 5a6a805..abf31f2

This rolls back to commit 5a6a8052dabfc23d1ccd5913481b31e1cd35618d.