Revert 00a2233..acc6b78

This rolls back to commit 00a2233d2921e05ccf4ebdd412308c3f41e20dda.