Revert f8dd380..a10cd44

This rolls back to commit f8dd38028839f60a141a64742bc4ecf6d671288d.