Revert a98f063..488478b

This rolls back to commit a98f063abebdce2e64e4d6e257d8342583c7d2a8.