Revert 24af97d..404f135

This rolls back to commit 24af97d19ea8e38d57b8d22b119e947aa9d95b86.
take pod revert