Revert 056f528..2e80188

This rolls back to commit 056f528e1f55c570fea43bcb24deabd0c099c458.