Revert 4588fec..2bd347a

This rolls back to commit 4588fec50d3f18374f5166df246df98c580de77e.