Revert 5219ebd..a99cacf

This rolls back to commit 5219ebd328bba2e1359f04d785383fbc81ceed5e.