Revert f8ba91b..6053acd

This rolls back to commit f8ba91bda478507b6ecb4dd6ca96481e865c7efe.