Revert 6745c6b..fb6e3c0

This rolls back to commit 6745c6b4294f809575529299f9d99bfb9be66133.