Revert 9c6cccd..eb0cb62

This rolls back to commit 9c6cccd42b3831b327ba0c8d6fa9800686dad899.