Revert a3f4e75..62f5d90

This rolls back to commit a3f4e7557bbb7996c19330f3338b609f5f46f5aa.