Revert "temporary hack"

This reverts commit e62aa320c2006622b819a16b86f7a06ecc198d9a.