Revert "Hopefully fixed current revision"

This reverts commit f5e97e87c9a72387971c9b9bff83f4e70b4688ea.