Revert fc24403..de98c15

This rolls back to commit fc24403349dd81de11d7e4245bce05af16dbff42.