Revert 55fec63..a7755f7

This rolls back to commit 55fec63823ad0cae419b5d24b5fe200178832d1c.