Revert 8d46e61..fe06129

This rolls back to commit 8d46e61da562ead68092c835eb9da56ce071329e.