Revert a55cbeb..96114ad

This rolls back to commit a55cbebcbf1bc0df4d7b5bde403cff80ae6899a3.