Revert 25fb598..8206e49

This rolls back to commit 25fb59866398edf82f0658b0d524b2740e5b4d35.