Corrected behavior in production envirionment

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
Strip out a SHITTON of D2

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>