commit da buttare
Revert 508de43..66a1a74

This rolls back to commit 508de433eda1d2108378aa4913d016399818fa3c.