Revert 716bd92..f7dc27f

This rolls back to commit 716bd924d66c834cd0d87832a3d1b5eb45d82f5a.