Revert 094ca09..b578603

This rolls back to commit 094ca09f9424f13c4f22cc568a8e5e110a4f2dc2.